Still doing more fixes

@citricsquid Still doing more fixes so can you not merge till done :P Thanks.