static path handling
minor bugs fixing