fixes and tweaks
version - 0.4