Major update. Fixed problems and added features.