fixed calculating current class
added week changed