fixing some stuff, thanks for the feedback!