Minor fixes and added compression