Still fixing some issues on my project