Fixes small bugs and naming standards