Added more code/features/fixes