Fixed some issues and added some another