Adding and fixing last few things with project